removed underscores from var names (not needed anymore)