Implemented code review changes for issue #9