Clang: reworked based on review