Fix derp, and reduce debugging

PS2:  Fixed whitespaces and tabs

Change-Id: I8728caf968f1cedff06d6bfd5ff0eeb0ec6d68d9