Method separation to reduce redundant code