Changes following code review
Avoid linting issue of defining the same property twice, avoid having to use a property that requires prefixing