Make code more maintainable