Minor refinement
Winter cleaning