[IMP] Style tuning
[IMP] Empty lists formatting