minor code tidy ups