Overall readability

variables have names now (wow). overall fixes