Working on simplification, aesthetics