- tests added
- improved formatting