Neatening up the codebase