Morning commit

No major changes. Possible stylistic changes.