clean up, make it an app