Little more cleanup, starting to get a feel for this.