Tidied up indenting in modules