Made changes talked about in #18: just some cleanup.