Feature/fix line wrapping

Fix line wrapping to 82 characters to improve layout when printed.