old code removed, small refactor