Few Changes:

From here on: REFACTORING (!!!) So a lot of methods will be deleted which are not needed anymore