better code style applied