Minor Parse for Android cleanup