Cleaned up the app a bit.