Use anchors to ensure ordering with jenkins class

Just a clean up and merge conflict fix of #17