simplify
small refectoring, make it simpler