List same course only - refs BT#8986
Fix confusing message - refs BT#8986
Minor - format code - refs BT#8986
Minor - Code conventions - refs BT#8986