Cleaning code everywhere!