Minor cleanup. Use common helper method