Cleanup - docs, formatting, etc