first round of cleanup
code lineup