Checks can be combined.
More apt naming.
Code formatting tweak.