Code clean, move record update methods into separate class