Refactored Kumite into a singleton