a bit of cleanup. #1