Moved utils functions into separate file
Formatted tabs/spaces