Organized everything for easier editing