[PATCH 15/18] Refactor to get rid of undescriptive variable names