Nitpicking the code

Minor changes here and there to remove warnings and make code cleaner and more uniform.
Ok, changed to `null` ... I reached my target which was making you think about it :)