got rid of remaining >80 lines