Switch complicated module if checks for simpler function
Merge pull request #2 from benhodgson87/improvement/module-enables

Switch complicated module if checks for simpler function