refactored a class. close #22
deleted class. close #22