Simplify install process a bit