Made my great code cleaner