Very minor code improvements