Fixing improper return
Whitespace issues