Improve code quality and fix poison stone