Improve and simplify installation