Make the class simpler, based on @mkonicek's comment