More uniform use of empty lines