[DEV] codestyle review