Extracted some methods to 2 new modules