modernization 2
cleanup
small fix