Refactoring

- all strategy classes replaced with functions