Add list style back in, minor cleanup