refactor some items; remove utils file