Fixed code style per request