Cleanup/Format code + gradle fix