cleanup bad styled code
use callback function from module