Code improvements. Commenting.