Fixed Gradlew and little code clean