Cleaned some component code.