Some cleanup after code inspection