Cleaned up components