Address review comment: While we're at it, semantic new lines.
Address review comments: Docstrings and formatting.
Address review comments: Move tests to appropriate class.