Updated documentation and cleaning up