Clean things up and make them look nice