mainly formatting and variable rename (for clarity) commit.