Edited few files for consistent content