Little bit clean up