Cosmetic fixes for previous commits

Signed-off-by: Marius Avram <marius.avram1309@gmail.com>