Minor code cleanup and documentation adjustments around strategy. #40