Clean-up & JSHint resolutions