Fixed some trailing spaces issues and tab issues