Code cleanup and refining for DTU-18.
Merge pull request #1 from jordandukart/7.x-DTU-18

Code cleanup and refining for DTU-18.