Beginning to make the comments clearer and naming consistent