made code more beautifull