major code cleanup.
update JS Whitespacing