Organized it better