Cleanup before pull request and add props to Viperbond007