Editor: Saner code and clean up.