Cosmetic fixes for previous commits

Signed-off-by: Marius Avram <marius.avram1309@gmail.com>
Merge pull request #521 from marius-avram/cosmetic_fixes

Cosmetic fixes for previous commits