cleaned up & added more comments to Android code