make code more clear to read

Find better names to code to improve read flow and make variable names
more descriptive