- code cleanup
- reorganized package
- renamed variables to match Android convention