refactoring: braces, spaces...