Cleanup according to android studio's suggestions