Refactor and cover by tests