Formating fixes, remove trailing spaces