Make it more clean