Cleaning up format