cleaned up basic app structure