more consistant var names