added gradle debug build type
code cleanup