Cleaned up sample app...