consistent naming & minor stuff