Daniel's code review

Change-Id: Ie19ce92a399428f7b9486b123b417918391d6512