Make it a little more clean