Highlight trailing spaces properly again
Fixes for shell formatting
Remove extra line