Updated small asignment changes

Signed-off-by: Lander Ghekiere <lander.ghekiere@gmail.com>