Fixed initial square x and y placement, cleanup