minor
cleanup + todo