Project cleanup/formatting