Cleaned up code some before printing and submitting