Fixed some empty listings and cleaned up formatting