Quick style fix and fix for non-organization repos