Add leader shortcuts
Remove trailing spaces