Clean up some methods in dual module
#629
+113
−108
Merged
dual module
#629