Feature/fix style