Cleanup code: vars naming