Simplify some logic
Line up similar lines
DRY