More separation of methods to reduce redundant code