Separate method to smaller