Cleaned up the components so they are easier to work with