replacing strategy
Some initial cleanup
Some initial cleanup