Tidied Code. Beautified Logging.