Whitespace normalization, typo and semantics fix

Signed-off-by: Marc Ranolfi <mranolfi@gmail.com>