Cleaned up ReviewAssistant

Change-Id: I75f25d6524018a88a07be05dcd577d0a45953ce5