fixes after code inspection