spruced up the code with some better identifiers