Implements review suggestions