Cleanup and organization, output updates