Build 6 - Code Cleanup

A little bit of code cleanup and added X and Y coordinates to the
saveFile