code review changes
Merge pull request #13 from AirDisa/code_review_changes

code review changes