Make it more clean.