[WE 165] Getting rid of some bad habits