Style updated
Small fixes