Tiddy up nesting in code for easy reading