Tidying up dependency addition generator:

- Compressing if/else boolean returns to single line boolean return
- Removing extra indentation/linespaces
- Removing commented-out code