Simplify previous by adding initializion

This way it should be future proofed against further changes.