removed code, etc. made unnecessary by simplifications
improved styling