Fixed mandatory param after optional
Removed unwanted trailing spaces