clean up documentation and naming

affects #1 and #14