Avoid special cases
Improve line shortening style