Cleaned up Component.