refactoing methods.
removing useless attribute.
updating method calls.