Working in landscape; clean up code