Watersmart 398

I know we discussed using tabs and not spaces, but now this file has two separate indentation types. We should either reformat the whole project (not it!), or stick with existing convention.