Move code and add comment