Clean up, move around and refactor