minor cleanup
minor cleanup/modernization