Don't overuse one letter variables, closes #138