Moving onto cleaning up CSS