Minor code improvements, and commenting