implement some minor remarks from houtvercruysse team

Signed-off-by: Karel Kellner <karel@kellner.be>