Extract methods
Remove deprecation warnings
Speed up Owner#cpu_time