These various "DS-1656" comments should be unnecessary. It'd be better to add comments which describe what the code is doing, as needed. 

Also, I notice there's some odd spacing / empty lines in the code. It'd be nice to get those cleaned up as well.