Standards improved; blank lines and concat spacing