Simplified the format of the lists so it's less obnoxious :)