adjusted coding-style