refact for style conformity