Continued cleanup, simplification, pretty new look