Refactoring - extracting some methods