Code cleanup and refining for DTU-18.