Cosmetics
Feature #19