Cleaned up outputs and some redundant code (usage of incrementers)