Moved utility
Cleaning, renamed some internals