Revert "cleaned up some code"

This reverts commit e10ce94f3d32ce1b2c0f337184b59cc5f822a08b.

Conflicts:
	PayBack/res/values/strings.xml
Revert "Revert "cleaned up some code""

This reverts commit b9e1d9c1b9c9312b038e8813f943219617c8ff13.