Removed strategy abstractFactory and cleaned up several bits of code