Code clean and updated targetSdkVersion=21