remove unncessary types
Properly separate screen and world logic