Updating main branch

Creating a pull request for commenting ability
We use the Android style for public Android code - so this is actually fine. https://source.android.com/source/code-style.html#use-standard-brace-style