Clean up of documentation and code