cosmetic changes that make the branch more closer to antirez\redis