cleaned whitespace and added uniquify