US006 tested and completed
Code Review/refactor done with comments added