Code cleanup and logcat fix

lol after I saw logcat because of something other....it seems to be I was drunked
on that time I did that patch lmao.

Whatever fixed now and a lot nicer ;)

cheers

Change-Id: I3b58099a18ff290317282906a10c64bb6fe0cb0d