Fix some issues, make it readable etc.