(Bug 3994) : Tidied up indents, removed trailing spaces