Slight cleanup to app structure