Feature/variable prefix

Line is too long. [172/130]