Small formatting changes and uncomment out code that was commented out
for testing purposes.