Doc block cleanup

Resolves #36