Final commit

Cosmetic changes. Remember to run rake ez:tables before checking the
code