Refactor model optimizations, Add number prefix to docs so are in order