Refactor and move around some code
Further refactoring