[code style] Changed modules logic