Seperated and clean up module codes