Stylistic changes for conformity with rest of code
Style changes and unneeded lines removed
Test domain corrected