Little bit of house keeping