Starting to clean up styles