code clean up
squarify