Expand documentation, name cleanup