Fix bug with parent company
Create some string constants
Unused method parameters
Keep exception
Correct logger