refactor to limit lines to 80 chars