Extracting few methods to improve readability