Code style now similar to pre