Code cleanup prior to merge with Master