Refactoring
Screen 3 done