[IM] Tidying up
[IM] More tidying up