tidy up commit -- should have been better about this