Improve readability, continue work