Formatted and cleaned up