Gradle stuff
Format
Fixed few localization issues