Cleaning up, making things pretty!!