code clean up for feature #2 commits