Made code cleaner