Fix formatting, remove setup.pp