Changed sensitive fields to private, cleaned up a few things