Refactoring code, adding warrior class and helpers