Pubstwo 1034

The last two commits were to address formatting issues. It might be easier to review the individual commits since they did not overlap.