tidy some changes