Cleanup

This is just random cleanup I came across while looking through the repo, getting reacquainted with its inner workings.