Minor reformat of code.
Clean up packages.