Cleanup

Some cleanup and documentation