Code clean-up, adds missing comments in code.