Made comparison operators free functions to avoid ADL issues
Fixed indentation and trailing whitespaces