Refactored, cleaned up code, update app