Formatted and cleant up