formatted and cleanup