made code more ninja