Android code clean-up