Small aesthetic changes, new issue with simplification