Fixed lang in comments and removed rudiment property