Made my previous commit code cleaner