Getting a more uniform code