cleaning things up so if anyone ever forks this or contributes by workflow will make some sense