refactor / cleanup

... just cuz