Rename variables
Clean up wrapScreen and addBody