Comment cleanup
Bump constant coverage to 100%