Did some work

Spent a couple hours reformatting the code, and re-familiarizing myself
with where I left off a few months ago.