Code clean up: consistent code style (2 spaces)