Updated Insurance and improved code readability