Optimize code

[auricgoldfinger]

Sorry to bother you with another pull request in such a short notice 🙈 Tonight, I thought about some other code optimizations. This is a modification just to clean up the code a little more, at least in my opinion, as well as a little fix in the Readme (using Android Studio in stead of IntelliJ) I tried to push it into the previous pull request but I noticed you already merged it (that was fast!)