Did changes on code review onFlight. Made todos.
excuted suggestions made at code review.
Merge pull request #157 from abeykoon/topic_code_review_changes

Topic code review changes