Clean up and edits.

Signed-off-by: Johnny Slagle <jslagle@apple.com>