Updated for Sencha Touch 2.1 and did some code cleanup