Updated variable names & docs