Remove trailing spaces
Improve layout and remove trailing spaces