fix spacing and bundle 12 factor