revisit those solutions with better code