CSS cleaned up