PEP8ized + more intuitive variable names