removed console logs & changed some property names..