Updated install instructions
More cleanup