Corrected for whitespace and a few other lint warnings