Minor refactorings

can't think of any reason that really _needed_ to be literal `true`