Nitpicking the code

Minor changes here and there to remove warnings and make code cleaner and more uniform.