Code clean up   work on JSHint suggestions

Code review : Daniel Jao