Small changes, meaningfull variable names, inline functions