improve code style and fix as per #169 remark

Signed-off-by: Fotis Georgatos <fotis.georgatos@uni.lu>