minor gradle refactor