Used JSHint to comply issues