Doc/cleanup for screen related classes