refactor cruft
# general
e
refactor cruft