Removed the Zero property for Output

Source re-organization to improve readability