Minor changes to Square class