Remove uneeded class and rename variables/add new comments.