Fix syntax and cleanup structure
Fix syntax and cleanup structure


Former-commit-id: 35b43f528f24c8b7d01dea664eeb9d7ed10b702c
Former-commit-id: eb9875560e00cbd1ad27e13783a9167f015a8ee2
Former-commit-id: 9a0d8e5aa6ccb0730a25af3a6a62fab664fbdd0d
plus3it/SystemPrep,plus3it/SystemPrep,lorengordon/SystemPrep,lorengordon/SystemPrep