Minor code improvements: