Made Android title behaviour consistent with iOS body behaviour
Tidying of code