Cleanup and adding missing documentation