Some very minior cleanup