Initial steps for refactoring variable assignments

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>