Fixed: alignment issue of the comments