cleaning code updating it for android studio update