renaming
removed unneeded properties