chore(style): code cleanup

fix CS only specify types where strictly necessary
to ease readability.

Closes #522