Many refactoring and change practice in classes