removed unnecessary properties; new id naming style