removed unnecessarily duplicated properties