Adjusted code layout to rules