Code more clean, with 80 chars maximum per line