CSS method cleaned up