TASK: Fix MR issues

* Remove construct from interface.
* Fix wrong type hints.
* Keep naming of variable in sync.
* Also keep conditions format in sync.

Relates: #71
10 jobs for feature/71-refactor-removed-code in 2 minutes and 20 seconds (queued for 2 seconds)