Merge of minor clean up changes
Code cleanup finished