Some private method re-arranging