Moved things to util, cleaning