Fix bugs

Fix bugs from Sonar
Why did you remove info about file creator? Revert back, please.