Cleaner Code, added screenshot