Cleanup and Documentation

More cleanup and documentation