Cleanup based on Keith's comments. #753