Some style improvements, error level for logs has been changed