Gave better name to class and file