Working on cleaning up the strategies