Pre-presentaion refactoring 1