General cleanup to get app running outside of Joe's computer