Organize here, refactor there, format everywhere