Cleaning up and making it look pretty