Small amounts of refactoring to 141 code