This question is exactly seeking opinionated advice, there can't be factual or 'correct' methods when you simplify the code.