Minor fixes

While reviewing/reading the code, I found a few inconsistent stuff that I tried to fix here. WDYT?