Cleaned up some code and some storyboard stuff