Fixed CS and improved code readability