made it more clean