gradle: code clean-up