Getting rid of yet more hungarian notation