Re-added comments, style fixes