Improve a couple docstrings
Simplify/shorten implementation of a few functions.