Committing some small cosmetic changes before reorganizing the code.