Change the structure of class object to make code mush more clear