tidied up some /n'sw