review post: Heavy refactoring

Change-Id: 82329a2716
Story-Id: SF-15