simplify the code logic to avoid unless statement with a negative sentence
some simple comments to the modules