Install: Removes excessive dependencies.
Code: Saves extra nesting.
Merge pull request #540 from am11/master

Install: Removes excessive dependencies