cleaned up code and re-set strategy