Moved props to ShorthandProperties. Cleanup