Modified them files for proper coding convention