small cleanup, almost working app