adjusted nested listing and some formatting