Code improvement
Delete unnecessary class
Change a string