Refactor

Extract methods