Small changes
A bit more pythonic version with a modular option