General code cleanliness + extensibility