Inspected and improved the source code with Android Studio