some cleanup and a version bump with sligtly more idiomatic constant handling