Cleanup docs. Closes #324 #316