Bug fixes: spacing from #2 and a braces issue