Improved reused code