Refactor monsters