refactoring some code, removing phone cat app code..