Nitpicking the code

Minor changes here and there to remove warnings and make code cleaner and more uniform.
Use Log.e to match the isLoggable tag. Since it's not technically an error Log.DEBUG and Log.D would also probably be ok, I don't have a strong opinion.