Refactor LSST