Updates according to the comments by Tom and Lars
Remove extra blank lines and format the changed files