improve Android classes