1) Little fixes
2) More readable variable names