No-op changes around better var and file names and comments

Squashed commit of the following:

commit 58c69a7223b61aa083cb25a1575bc2fa0d3ee525
Author: Omid Aladini <omidaladini@gmail.com>
Date:   Tue Jun 17 14:14:52 2014 +0200

    Continued housekeeping, better variable names, file names and more comments.

commit 2b2d8f5d6a18139b1680a192ce5afe4839941d94
Author: Omid Aladini <omidaladini@gmail.com>
Date:   Tue Jun 10 15:03:15 2014 +0200

    Housekeeping, better variable names, file names and more comments.