Minor cleanup prior to merging to master