Code style clean up: fix white space and formatting