Code needed some fixing on the side

Sorry guys,
I am some kind of a cleanup nut and we had some pressing issues here. Whenever you see your commit changing all lines something is wrong with the commit. Please keep that in mind.