cleaned up object and scene code