Cleanup

- Minor clean up to components