Little bit more cleaned