Cleaned up gradle