more cleanup, test passes, feedback time?