Minor changes (Documentation, comments, etc.)