DDA Code Update

Also, code formatting.