small tweak plus removing empty lines