update to use streams
- updated less version
- updated test to use super test
- removed comments and modularized code