formatting issues
using 'nil instead of '() as empty list
a new batch of minor changes and improvements