Style changes

After you review the diff, if you have any questions about why I changed what I did, let me know.

Also, there are a few methods in the manager class with no corresponding method in the client. Those will have to be added so that they can be called.