Formatted and cleaned up sources