small refactoring in build, updated gradle wrapper