Added Spacing and Removed Debug Logging