General cleanup of the code and getting it to follow Google's Android developement standards