Extracted methods to less complex ones