Tidy changes & Android explanation