Some refactoring.
Solved the killing achievement bug.