refactored to be more comply to bono theme

Behold `strict mode` is coming :laughing: