Some cleanup. King and utility class added.