Made code cleaner

A Functionality