more consistent variables' and functions' naming scheme