Minor gradle refactoring