Small code cleanup
Be DRY
<3 ruby folks
Clean up AndroidManifest.xml