Making the code style match more of what was already there, adding documentation, etc