Clean up, formatting, fix the linked list mess.