Cosmetic changes + unit tests