- more cleanup
- fixed return values (gulp considers them)