Removed old util module, minor polishing