Trying to clean up CSS a bit