Consistent whitespace and code style