Organized it a bit better