Cleaned up loads of styling. AKA Procrastinated