Minor updates for code quality