Minor refactor to use Pimple properly