- Cleanup code to be more compatiable with android