refactord goal