Refactor kick/part logic (e.g. fix it)