Renaming variable value for clarity
Tidying up code