Clarifying logic and also grouping methods