Clean up code, pass 'gulp lint'
Merge pull request #74 from amitburst/clean-code

Clean up code, pass 'gulp lint'