Did some simple refactoring such as pull up