Prep for Jenkins + prettify