Code review by Eile

Change-Id: I47c4d6145b2164fa54435ac816c38954db86ecc7