simplifications
formatting
got rid of out of date comment