end of day commit
refactoring per Charles R comments