add base16 and clean