Cleaned up the PDF, Simplified some list management