Remove whitespace and minor style changes