made source code mostly conform to a 120 column limit