More code-cleanup

- reduced lines
- improved unity
- reduced number of computes