Considered some clang suggestions