Simplify installation

Simplify installation process