Renaming vars removing useless docs
Better var names
Code cleanup

Just whitespace fixes. Nothing major