Refactoring

Change the files using best practices in High Quality Code