Clean up and commenting, closes #12