Clean up, organize code. Try to conform to 80 cols.