Code/comment clean up.