interface economization, more cleanup, more comments