Formatting, fix fatal flaws, organizing