After little cleanup