Minor refactor of permissions