Removed underscores on properties