simplify / extract methods for clarity