add check for class, move a utility out to its own kt class

add check for class, move a utility out to its own kt class #156