further refining of var names and format