Cleaned up the component system a bit.