removing whitespace before / after names,
removed debug comments in connection