Minor formatting fixes

Fixes indentation to be a multiple of 4, and uses "cls" instead of "self" for the classmethod.