Fix indentation
Refactor StatusSnapshot to be reusable