Modified files to follow coding convetions.