Code cleanup

Changes requested by wvu-R7