made a bit more clean