Condense repeated code
Clarify docs a bit
Minor clarifications