Removed self prefix from cleaned up source.