Formatted and cleaned up the surcecode