minor money refactorings