[Jeev/Modules] Some style improvements