making retrieval a little more effficient
renaming variables for consistency