Idiomatic code and low hanging efficiency gains

Same for here, it's a duplication.