Added more appropriate name
Some optimalization