Observer and model code refacturing.