Cleanup

Made it look nice.