Added functions to make testing easier.  Code formatting fixes.