more clean
ajust code style