Moved handling of kicks to its own method