Tiddy up to make readable