Removed unused code and comments.

Improved code style to comply with the Android Code Style Guidelines (http://source.android.com/source/code-style.html)