Done some houseKeeping