pcx cleanup
Cleanup and refactoring
Rearranged formats.txt
Cleanup and refactoring