Additional minor code optimization