Cleaned Habib's dirty code!!