SDD Document update and code cleaning.