Cleaned up components.