Refactor to fix Clang warnings

Signed-off-by: Tomasz Michalak <tmichalak@antmicro.com>
4 files changed