Cleanup according to android studio's suggestions Part 2