DD - Fixes comments and hard coding.