small refactor
Merge branch 'master' of https://github.com/louisnk/basic_utilities

Merged in refactor