Added Android version and cleaned-up iOS version
Some clean-up