Reduced complexity in utilities

closes #8