Refactor to get rid of after_save

And stop setting instance vars in an instance method