General clean-up; removed redundant verbose variable