updated var names to proper camelcase