A lot of fixes

1 trailing blank lines detected.