Refactor: from long function to small units