Update: Reformated comments