Better coding style, changing some variable names.