Comment 4 for bug 525508

This is my first patch ever so please criticize me as much as you can (I'm serious on this). I was in doubt whether to make smallest change possible or to reorginize some of the code. I went with the first option. I hope with time I will find a balance between the amount of changes and general impact of the code.