80 Cols per line, corrected indentation in files & implemented DRY