Rename variables, organize, etc.