Code templates are now cleaner (less extra whitespace)