Extract methods from update! to make stuff cleaner