Create gem class and code clean