Cleaned up and organized

Organized style into similar groups.