Cleaned up utils
Merge pull request #895 from ostcar/utils

Cleaned up utils