Reduce excessive use of threading macros
Use standard dolist/mapc in place of --each
Replace -map with standard mapcar