Remove references to the deploy directory; formatting fixes