Clean used code and refactors class name