more cleanup & formatting