Refactor Variable-Handling.