Removed extraneous whitespace and coding style changes for simpler comparison