app: some random code cleanup