Code retidying