cleanups
move around a bit