CSS Clean up