Formatted and commented latest changes