refactor cleanup

Woot