Make a bit cleaner