Code restructuring and comments.