Simplify, simplify and simplify
Move to installer.sh