fixed some var names for more human readable