made code structure prettier