Slightly saner code organization