Changes requested in review.

1) Cosmetic layout changes
2) Use (void) instead of () in forward declarations