Don't run regular commands as the root
Simplify preconditions