Review and cosmetic changes

Some things require modifications. Pretty immediately.