updated variable names and refactored to QA instead of TODO