Refactor firsts update