Reduce line lengths to under 80 chars and remove trailing whitespace

Reduce line lengths to under 80 chars and remove trailing whitespace #23