Cleanup; reducing file header, removing unnecessary details.