Fixed some cs minor issues