improving code readabilty a (little) bit