Global refactor of android interface