Cleaned some things up and improved visualization