Fix trailing spaces, code style