Refactoring of variables and functions

This page is currently under construction.