Cleanup, improve code readability.