Iets nettere code

Change-Id: I9acca6ada7013b9be0bd70551d2b85f1d202c840