Improved code cleanliness