Changed variable style and added private vars template