Minor cleanups
Closes #25 (closed) Closes #26 (closed) Closes #27 (closed) Closes #28 (closed) Closes #29 (closed) Closes #34 (closed) Closes #41 (closed)
Closes #25 (closed) Closes #26 (closed) Closes #27 (closed) Closes #28 (closed) Closes #29 (closed) Closes #34 (closed) Closes #41 (closed)