Use modern update syntax
Abstract color finder logic into separate class