Code quality of life improements