GPII-941: Cleaned up, jshint/jsonlinted