Reformat and cleanup static version