Finish decorators refactoring

Change-Id: I53dc237d99630fc666d02194a4fa433df493aeff