Refactored to clean up some extraneous output