Small fixes
Small fix
Style fixes