Aesthetics and comments changes