Initial Cleanup: Starts passing JSHint