addressed some code review issues