General cleanup now that I've split the class and executable into different files.