Add comments, delete unnecessary fn