Tidied Up. Updated Lib.