Clean up App a bit