Some little cleanup