Formatted comments and reworked 'printing' API.