Trivial validation and cosmetic changes