Fix output files ignore
Clean up comments
Decompose output. Clean up code