made code more pretty