Cleaner code, each line only 80 chars