Added singleton
Updating to meet android coding style guidelines