Cleanup & comments
Moved utilities to separate folder