Implicit return
Refactor modules collection
Add modules guard
Remove testing stuff, oops