address PR comments. fix spacing, introduce constant, change order of comparisons in .equals.