Code base clean up

- Cleaned up code base.