JSHint fixes
Changing underscore-naming to camelcasing