Refactor strype