Changed variable names to flow better & made more specifications