Fixed CS and MD issues