Generate code a little bit cleaner