Refactoring

Small fixes decided with Nemesis @NinuxDay2013