Better Code Changes

Updated the code to ensure that meets the Android Coding Standards.