Further neatening of code.