Small clean-up to reflect latest changes.

Hi! 

This is just one commit. Please see the comments below.

G

PS. I'm still kinda new to all this github thing, please bear with me if this is not the way the git etiquette recommends. :)