Further refactoring awesomeness