Style fixes, add alias to remove trailing spaces