Makes refactor to increase redability