Formatted and enhansed code