Bunch of minor cleanup, getting used to the code.