Code clean up

1) Getting code ready for code review